From 755a7aaee0944800ff8666715ec32b88775816b2 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 27 Jan 2015 16:58:06 +0000 Subject: [PATCH] tools/libxc: Disable CONFIG_MIGRATE in stubdom environments The legacy save/restore infrastructure requires several function pointers from the toolstack (libxl or Xend in the past) in order to work, and for HVM guests also need to be able to play around in dom0's filesystem to move the device model save record. Migration v2 changes some of this, but is similarly dependent on toolstack-provided function pointers. Someone who wishes to re-architect the interaction of moving parts for running a domain might be in a position to re-enabled this, but for now, explicitly fail with ENOSYS (from xc_nomigrate.c) rather than failing with an error about a missing function pointer (or indeed falling over a NULL pointer on certain paths). Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- tools/libxc/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 7587d4cc20..6fa88c743c 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -4,6 +4,11 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 4.5 MINOR = 0 +ifeq ($(CONFIG_LIBXC_MINIOS),y) +# Save/restore of a domain is currently incompatible with a stubdom environment +override CONFIG_MIGRATE := n +endif + CTRL_SRCS-y := CTRL_SRCS-y += xc_core.c CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c -- 2.30.2